home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
TeX 1995 July
/
TeX CD-ROM July 1995 (Disc 1)(Walnut Creek)(1995).ISO
/
graphics
/
gnuplot
/
contrib
/
yamamoto
/
mac.mod
< prev
Wrap
Internet Message Format
|
1992-03-18
|
53KB
From sun!kekvax.kek.jp!YAMAMOTO@pixar.com Wed Mar 18 04:32:31 1992
Return-Path: <sun!kekvax.kek.jp!YAMAMOTO@pixar.com>
Received: from ucbvax.Berkeley.EDU by ra-next.arc.nasa.gov (NeXT-1.0 (From Sendmail 5.52)/NeXT-1.0)
id AA00715; Wed, 18 Mar 92 04:32:20 PST
Received: from sun.UUCP by ucbvax.Berkeley.EDU (5.63/1.43)
id AA12248; Wed, 18 Mar 92 04:37:31 -0800
Received: from sun.UUCP by pixar.com (4.1/NBN-15/PIX-10)
id AA00585; Wed, 18 Mar 92 03:54:15 PST
Received: from Sun.COM (sun-barr) by sun.Eng.Sun.COM (4.1/SMI-4.1)
id AA08856; Wed, 18 Mar 92 01:25:59 PST
Received: from kekvax.kek.jp ([130.87.34.1]) by Sun.COM (4.1/SMI-4.1)
id AA10482; Wed, 18 Mar 92 01:25:46 PST
Message-Id: <9203180925.AA10482@Sun.COM>
Date: 18 Mar 92 18:25:00 GMT+9:00
From: "NOBORU YAMAMOTO " <sun!kekvax.kek.jp!YAMAMOTO@pixar.com>
Subject: Re: gnuplot on Apple Macintosh
To: "pixar!ucbvax!ra-next.arc.nasa.gov!woo" <sun!ra-next.arc.nasa.gov!woo>
Status: R
Hi,
I'm sorry for not replying your e-mail for a long time. My hard disc had
crashed shortly after I wrote previous mai. I have not been able to find time
to rebuild gnuplot on Mac.
Here I enclose "diff -c" patch for gnuplot 3.0 on Mac. you also need
TC-console.c and TC_console.h files , which I will send in separate e-mail.
The graphics.c file is too big for THINK-C compiler. I forced to divide it into
two part.
Hope it help someone in the world.
Noboru Yamamoto
---------------- diff -c <modified> <original > ---------------------
Only in ../gnuplot: Makefile
Only in src: TC_console.c
Only in src: TC_console.h
diff -c src/bitmap.c ../gnuplot/bitmap.c
*** src/bitmap.c Sun Feb 2 09:44:43 1992
--- ../gnuplot/bitmap.c Fri Jul 19 03:54:16 1991
***************
*** 789,799 ****
b_angle = 0;
b_rastermode = 0;
/* allocate row pointers */
! b_p = (bitmap *)alloc( (size_t) rows * sizeof(pixels *), "bitmap row buffer");
bzero(b_p, rows * sizeof(pixels *));
for (j = 0; j < rows; j++) {
/* allocate bitmap buffers */
! (*b_p)[j] = (pixels *)alloc((size_t) x * sizeof(pixels),(char *)NULL);
if ((*b_p)[j] == (pixels *)NULL) {
b_freebitmap(); /* free what we have already allocated */
int_error("out of memory for bitmap buffer", NO_CARET);
--- 789,799 ----
b_angle = 0;
b_rastermode = 0;
/* allocate row pointers */
! b_p = (bitmap *)alloc( rows * sizeof(pixels *), "bitmap row buffer");
bzero(b_p, rows * sizeof(pixels *));
for (j = 0; j < rows; j++) {
/* allocate bitmap buffers */
! (*b_p)[j] = (pixels *)alloc(x * sizeof(pixels),(char *)NULL);
if ((*b_p)[j] == (pixels *)NULL) {
b_freebitmap(); /* free what we have already allocated */
int_error("out of memory for bitmap buffer", NO_CARET);
***************
*** 1054,1057 ****
{
b_angle=(unsigned int)ang;
return TRUE;
! }
--- 1054,1057 ----
{
b_angle=(unsigned int)ang;
return TRUE;
! }
diff -c src/bitmap.c ../gnuplot/bitmap.csrc/bitmap.h ../gnuplot/bitmap.h
*** src/bitmap.h Tue Jan 21 10:08:49 1992
--- ../gnuplot/bitmap.h Tue Jun 4 07:25:57 1991
***************
*** 29,39 ****
typedef unsigned char pixels; /* the type of one set of 8 pixels in bitmap */
- #ifdef THINK_C
- typedef pixels **bitmap; /* the bitmap */
- #else
typedef pixels *bitmap[]; /* the bitmap */
- #endif
extern bitmap *b_p; /* global pointer to bitmap */
extern unsigned int b_currx, b_curry; /* the current coordinates */
--- 29,35 ----
diff -c src/bitmap.h ../gnuplot/bitmap.hsrc/command.c ../gnuplot/command.c
*** src/command.c Sat Jan 25 11:25:12 1992
--- ../gnuplot/command.c Tue Sep 24 23:51:22 1991
***************
*** 90,107 ****
* instead of <strings.h>
*/
- #ifdef THINK_C
- extern char *gets(),*getenv();
- extern char *strcpy(char *, char *);
- extern char *strncpy(char *, char *, size_t);
- extern char *strcat(char *, char *);
- extern int strcmp(char *, char *);
- extern size_t strlen(char *);
- #else
extern char *gets(),*getenv();
extern char *strcpy(),*strncpy(),*strcat();
extern int strlen(), strcmp();
- #endif
/*
* Only reference to contours library.
--- 90,98 ----
***************
*** 287,308 ****
else if (almost_equals(c_token,"sa$ve")) {
if (almost_equals(++c_token,"f$unctions")) {
if (!isstring(++c_token))
- #ifdef THINK_C
- { Point where={97,103};
- SFReply reply;
-
- SFPutFile(where,NULL, "\pUntitled",NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- save_functions(fopen((char *) reply.fName,"w"));
- }
- else{
- int_error("expecting filename",c_token);
- }
- }
- #else
int_error("expecting filename",c_token);
- #endif
else {
quote_str(sv_file,c_token);
save_functions(fopen(sv_file,"w"));
--- 278,284 ----
***************
*** 310,331 ****
}
else if (almost_equals(c_token,"v$ariables")) {
if (!isstring(++c_token))
- #ifdef THINK_C
- { Point where={97,103};
- SFReply reply;
-
- SFPutFile(where,NULL, NULL,NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- save_variables(fopen((char *) reply.fName,"w"));
- }
- else{
- int_error("expecting filename",c_token);
- }
- }
- #else
int_error("expecting filename",c_token);
- #endif
else {
quote_str(sv_file,c_token);
save_variables(fopen(sv_file,"w"));
--- 286,292 ----
***************
*** 333,354 ****
}
else if (almost_equals(c_token,"s$et")) {
if (!isstring(++c_token))
- #ifdef THINK_C
- { Point where={97,103};
- SFReply reply;
-
- SFPutFile(where,NULL, NULL,NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- save_set(fopen((char *) reply.fName,"w"));
- }
- else{
- int_error("expecting filename",c_token);
- }
- }
- #else
int_error("expecting filename",c_token);
- #endif
else {
quote_str(sv_file,c_token);
save_set(fopen(sv_file,"w"));
--- 294,300 ----
***************
*** 359,406 ****
save_all(fopen(sv_file,"w"));
}
else {
- #ifdef THINK_C
- Point where={97,103};
- SFReply reply;
-
- SFPutFile(where,NULL, NULL,NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- save_all(fopen((char *) reply.fName,"w"));
- }
- else{
- int_error(
- "filename or keyword 'functions', 'variables', or 'set' expected",
- c_token);
- }
- #else
int_error(
"filename or keyword 'functions', 'variables', or 'set' expected",
c_token);
- #endif
}
c_token++;
}
else if (almost_equals(c_token,"l$oad")) {
if (!isstring(++c_token))
- #ifdef THINK_C
- { Point where={97,103};
- SFReply reply;
-
- SFGetFile(where,NULL, NULL, -1,NULL,NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- strcpy(sv_file,(char *) reply.fName);
- printf("loading %s \n",sv_file);
- load_file(fopen((char *)reply.fName,"r"),(char *) reply.fName);
- c_token = num_tokens = 0;
- }
- else
- int_error("expecting filename",c_token);
- }
- #else
int_error("expecting filename",c_token);
- #endif
else {
quote_str(sv_file,c_token);
load_file(fopen(sv_file,"r"), sv_file);
--- 305,319 ----
***************
*** 2044,2050 ****
}
if (samples < 2 || iso_samples < 2)
! int_error("samples or iso_samples < 2. Must be at least 2.\n",NO_CARET);
xdiff = (x_max - x_min) / (samples - 1);
ydiff = (y_max - y_min) / (samples - 1);
--- 1957,1963 ----
}
if (samples < 2 || iso_samples < 2)
! int_error("samples or iso_samples < 2. Must be at least 2.\n");
xdiff = (x_max - x_min) / (samples - 1);
ydiff = (y_max - y_min) / (samples - 1);
***************
*** 2441,2447 ****
/* Ok, fix up the title to include both the xp and yp plots. */
if (xp->title && xp->title[0] != '\0') {
tlen = strlen (yp->title) + strlen (xp->title) + 3;
! new_title = alloc ((unsigned int) tlen, "string");
strcpy (new_title, xp->title);
strcat (new_title, ", "); /* + 2 */
strcat (new_title, yp->title); /* + 1 = + 3 */
--- 2354,2360 ----
/* Ok, fix up the title to include both the xp and yp plots. */
if (xp->title && xp->title[0] != '\0') {
tlen = strlen (yp->title) + strlen (xp->title) + 3;
! new_title = alloc ((unsigned int) tlen, "string");
strcpy (new_title, xp->title);
strcat (new_title, ", "); /* + 2 */
strcat (new_title, yp->title); /* + 1 = + 3 */
***************
*** 2623,2629 ****
tlen = (xp->title ? strlen(xp->title) : 0) +
(yp->title ? strlen(yp->title) : 0) +
(zp->title ? strlen(zp->title) : 0) + 5;
! new_title = alloc ((size_t) tlen, "string");
new_title[0] = 0;
if (xp->title) {
strcat(new_title, xp->title);
--- 2536,2542 ----
tlen = (xp->title ? strlen(xp->title) : 0) +
(yp->title ? strlen(yp->title) : 0) +
(zp->title ? strlen(zp->title) : 0) + 5;
! new_title = alloc ((unsigned int) tlen, "string");
new_title[0] = 0;
if (xp->title) {
strcat(new_title, xp->title);
***************
*** 2828,2840 ****
do_shell()
{
- #ifdef THINK_C
- int_error("'shell' is not supported on this version.",c_token);
- #else
if ((vaxc$errno = lib$spawn()) != SS$_NORMAL) {
os_error("spawn error",NO_CARET);
}
- #endif
}
--- 2741,2749 ----
***************
*** 2882,2889 ****
/* huge static variables (1k each). Instead we dynamically allocate them */
/* on the first call to this function... */
if (helpbuf == NULL) {
! helpbuf = alloc((size_t) MAX_LINE_LEN, "help buffer");
! prompt = alloc((size_t) MAX_LINE_LEN, "help prompt");
helpbuf[0] = prompt[0] = 0;
}
--- 2791,2798 ----
/* huge static variables (1k each). Instead we dynamically allocate them */
/* on the first call to this function... */
if (helpbuf == NULL) {
! helpbuf = alloc(MAX_LINE_LEN, "help buffer");
! prompt = alloc(MAX_LINE_LEN, "help prompt");
helpbuf[0] = prompt[0] = 0;
}
diff -c src/command.c ../gnuplot/command.csrc/contour.c ../gnuplot/contour.c
*** src/contour.c Wed Jan 22 08:10:28 1992
--- ../gnuplot/contour.c Fri Jul 19 03:55:53 1991
***************
*** 217,223 ****
"gnuplot_contour");
cntr->coords = (struct coordinate *) alloc(sizeof(struct coordinate) *
! (size_t) crnt_cntr_pt_index,
"contour coords");
for (i=0; i<crnt_cntr_pt_index; i++) {
cntr->coords[i].x = crnt_cntr[i * 2];
--- 217,223 ----
"gnuplot_contour");
cntr->coords = (struct coordinate *) alloc(sizeof(struct coordinate) *
! crnt_cntr_pt_index,
"contour coords");
for (i=0; i<crnt_cntr_pt_index; i++) {
cntr->coords[i].x = crnt_cntr[i * 2];
***************
*** 903,911 ****
double dt, *tangents_x, *tangents_y;
int i;
! tangents_x = (double *) alloc((size_t) (sizeof(double) * n),
"contour c_s_intr");
! tangents_y = (double *) alloc((size_t) (sizeof(double) * n),
"contour c_s_intr");
if (n > 1) prepare_spline_interp(tangents_x, tangents_y, p_cntr, n,
--- 903,911 ----
double dt, *tangents_x, *tangents_y;
int i;
! tangents_x = (double *) alloc((unsigned) (sizeof(double) * n),
"contour c_s_intr");
! tangents_y = (double *) alloc((unsigned) (sizeof(double) * n),
"contour c_s_intr");
if (n > 1) prepare_spline_interp(tangents_x, tangents_y, p_cntr, n,
***************
*** 942,948 ****
int i;
double t, dt;
! hermit_table = (table_entry *) alloc ((size_t) (sizeof(table_entry) *
(num_approx_pts + 1)),
"contour hermit table");
t = 0;
--- 942,948 ----
int i;
double t, dt;
! hermit_table = (table_entry *) alloc ((unsigned) (sizeof(table_entry) *
(num_approx_pts + 1)),
"contour hermit table");
t = 0;
***************
*** 1016,1024 ****
tri_diag *m; /* The tri-diagonal matrix is saved here. */
struct cntr_struct *p;
! m = (tri_diag *) alloc((size_t) (sizeof(tri_diag) * n),
"contour tri_diag");
! r = (double *) alloc((size_t) (sizeof(double) * n),
"contour tri_diag2");
n--;
--- 1016,1024 ----
tri_diag *m; /* The tri-diagonal matrix is saved here. */
struct cntr_struct *p;
! m = (tri_diag *) alloc((unsigned) (sizeof(tri_diag) * n),
"contour tri_diag");
! r = (double *) alloc((unsigned) (sizeof(double) * n),
"contour tri_diag2");
n--;
***************
*** 1182,1190 ****
int i, p;
double ti, tikp, *dx, *dy; /* Copy p_cntr into it to make it faster. */
! dx = (double *) alloc((size_t) (sizeof(double) * (order + j)),
"contour b_spline");
! dy = (double *) alloc((size_t) (sizeof(double) * (order + j)),
"contour b_spline");
/* Set the dx/dy - [0] iteration step, control points (p==0 iterat.): */
for (i=j-order; i<=j; i++) {
--- 1182,1190 ----
int i, p;
double ti, tikp, *dx, *dy; /* Copy p_cntr into it to make it faster. */
! dx = (double *) alloc((unsigned) (sizeof(double) * (order + j)),
"contour b_spline");
! dy = (double *) alloc((unsigned) (sizeof(double) * (order + j)),
"contour b_spline");
/* Set the dx/dy - [0] iteration step, control points (p==0 iterat.): */
for (i=j-order; i<=j; i++) {
Only in ../gnuplot: demo
Only in ../gnuplot: docs
Only in src: dummyroutines.c
diff -c src/contour.c ../gnuplot/contour.csrc/eval.c ../gnuplot/eval.c
*** src/eval.c Wed Jan 22 08:10:56 1992
--- ../gnuplot/eval.c Fri Jul 19 03:56:29 1991
***************
*** 63,69 ****
}
*udv_ptr = (struct udvt_entry *)
! alloc((size_t)sizeof(struct udvt_entry), "value");
(*udv_ptr)->next_udv = NULL;
copy_str((*udv_ptr)->udv_name,t_num);
(*udv_ptr)->udv_value.type = INT; /* not necessary, but safe! */
--- 63,69 ----
}
*udv_ptr = (struct udvt_entry *)
! alloc((unsigned int)sizeof(struct udvt_entry), "value");
(*udv_ptr)->next_udv = NULL;
copy_str((*udv_ptr)->udv_name,t_num);
(*udv_ptr)->udv_value.type = INT; /* not necessary, but safe! */
***************
*** 84,90 ****
udf_ptr = &((*udf_ptr)->next_udf);
}
*udf_ptr = (struct udft_entry *)
! alloc((size_t)sizeof(struct udft_entry), "function");
(*udf_ptr)->next_udf = (struct udft_entry *) NULL;
(*udf_ptr)->definition = NULL;
(*udf_ptr)->at = NULL;
--- 84,90 ----
udf_ptr = &((*udf_ptr)->next_udf);
}
*udf_ptr = (struct udft_entry *)
! alloc((unsigned int)sizeof(struct udft_entry), "function");
(*udf_ptr)->next_udf = (struct udft_entry *) NULL;
(*udf_ptr)->definition = NULL;
(*udf_ptr)->at = NULL;
diff -c src/eval.c ../gnuplot/eval.csrc/graph3d.c ../gnuplot/graph3d.c
*** src/graph3d.c Wed Jan 22 08:24:06 1992
--- ../gnuplot/graph3d.c Sat Sep 21 01:36:52 1991
***************
*** 36,44 ****
#include "setshow.h"
extern char *strcpy(),*strncpy(),*strcat(),*ctime(),*tdate;
- #ifdef THINK_C
- extern time_t dated,time();
- #else
#ifdef AMIGA_AC_5
extern time_t dated;
#else
--- 36,41 ----
***************
*** 48,54 ****
extern long dated,time();
#endif
#endif
- #endif
static plot3d_impulses();
static plot3d_lines();
--- 45,50 ----
***************
*** 612,618 ****
x = time_xoffset * t->h_char;
y = time_yoffset * t->v_char;
! dated = time( (time_t *) 0);
tdate = ctime( &dated);
tdate[24]='\0';
if ((*t->text_angle)(1)) {
--- 608,614 ----
x = time_xoffset * t->h_char;
y = time_yoffset * t->v_char;
! dated = time( (long *) 0);
tdate = ctime( &dated);
tdate[24]='\0';
if ((*t->text_angle)(1)) {
diff -c src/graph3d.c ../gnuplot/graph3d.csrc/graphics.c ../gnuplot/graphics.c
*** src/graphics.c Sat Jan 25 11:53:48 1992
--- ../gnuplot/graphics.c Tue Sep 10 05:13:19 1991
***************
*** 43,51 ****
extern char *strcpy(),*strncpy(),*strcat(),*ctime();
char *tdate;
- #ifdef THINK_C
- time_t dated,time();
- #else
#ifdef AMIGA_AC_5
time_t dated;
#else
--- 43,48 ----
***************
*** 55,61 ****
long dated,time();
#endif
#endif
- #endif
void plot_impulses();
void plot_lines();
--- 52,57 ----
***************
*** 197,202 ****
--- 193,199 ----
return(tic);
}
+
do_plot(plots, pcount, min_x, max_x, min_y, max_y)
struct curve_points *plots;
int pcount; /* count of plots in linked list */
***************
*** 463,469 ****
x = time_xoffset * t->h_char;
y = time_yoffset * t->v_char;
! dated = time( (time_t *) 0);
tdate = ctime( &dated);
tdate[24]='\0';
if ((*t->text_angle)(1)) {
--- 460,466 ----
x = time_xoffset * t->h_char;
y = time_yoffset * t->v_char;
! dated = time( (long *) 0);
tdate = ctime( &dated);
tdate[24]='\0';
if ((*t->text_angle)(1)) {
***************
*** 1387,1393 ****
xtick(place, xformat, spacing, 1.0);
}
}
- #ifndef THINK_C
/* DRAW_SET_YTICS: draw a user tic set, y axis */
draw_set_ytics(list)
--- 1384,1389 ----
***************
*** 1426,1431 ****
--- 1422,1428 ----
list = list->next;
}
}
+
/* draw and label a y-axis ticmark */
ytick(place, text, spacing, ticscale)
double place; /* where on axis to put it */
***************
*** 1563,1566 ****
}
}
}
- #endif
--- 1560,1562 ----
Only in src: graphics_1.c
Only in src: graphics_2.c
diff -c src/graphics.c ../gnuplot/graphics.csrc/help.c ../gnuplot/help.c
*** src/help.c Sun Feb 2 09:18:21 1992
--- ../gnuplot/help.c Thu Jul 25 00:44:31 1991
***************
*** 155,161 ****
};
static LINKEY *keylist = NULL; /* linked list of keys */
static KEY *keys = NULL; /* array of keys */
! static size_t keycount = 0; /* number of keys */
static FILE *helpfp = NULL;
static int LoadHelp();
--- 155,161 ----
};
static LINKEY *keylist = NULL; /* linked list of keys */
static KEY *keys = NULL; /* array of keys */
! static int keycount = 0; /* number of keys */
static FILE *helpfp = NULL;
static int LoadHelp();
***************
*** 310,316 ****
if (new == NULL)
int_error("not enough memory to store help file", -1);
if (text != NULL) {
! new->line = (char *) malloc((size_t)(strlen(text)+1));
if (new->line == NULL)
int_error("not enough memory to store help file", -1);
(void) strcpy(new->line, text);
--- 310,316 ----
if (new == NULL)
int_error("not enough memory to store help file", -1);
if (text != NULL) {
! new->line = (char *) malloc((unsigned int)(strlen(text)+1));
if (new->line == NULL)
int_error("not enough memory to store help file", -1);
(void) strcpy(new->line, text);
***************
*** 334,340 ****
new = (LINKEY *)malloc(sizeof(LINKEY));
if (new == NULL)
int_error("not enough memory to store help file", -1);
! new->key = (char *) malloc((size_t)(strlen(key)+1));
if (new->key == NULL)
int_error("not enough memory to store help file", -1);
(void) strcpy(new->key, key);
--- 334,340 ----
new = (LINKEY *)malloc(sizeof(LINKEY));
if (new == NULL)
int_error("not enough memory to store help file", -1);
! new->key = (char *) malloc((unsigned int)(strlen(key)+1));
if (new->key == NULL)
int_error("not enough memory to store help file", -1);
(void) strcpy(new->key, key);
***************
*** 358,364 ****
int i; /* index into key array */
/* allocate the array */
! keys = (KEY *)malloc((size_t)((keycount+1) * sizeof(KEY)));
if (keys == NULL)
int_error("not enough memory to store help file", -1);
--- 358,364 ----
int i; /* index into key array */
/* allocate the array */
! keys = (KEY *)malloc((unsigned int)((keycount+1) * sizeof(KEY)));
if (keys == NULL)
int_error("not enough memory to store help file", -1);
diff -c src/help.c ../gnuplot/help.csrc/misc.c ../gnuplot/misc.c
*** src/misc.c Wed Jan 22 08:12:52 1992
--- ../gnuplot/misc.c Fri Aug 23 02:20:15 1991
***************
*** 43,57 ****
#include <graphics.h>
#endif
! #ifdef THINK_C
! extern void *malloc();
! extern void *realloc();
! #else
! #ifndef _IBMR2
extern char *malloc();
extern char *realloc();
#endif
- #endif
extern int c_token;
extern char replot_line[];
--- 43,52 ----
#include <graphics.h>
#endif
! #ifndef _IBMR2
extern char *malloc();
extern char *realloc();
#endif
extern int c_token;
extern char replot_line[];
***************
*** 118,124 ****
cp->p_max = (num >= 0 ? num : 0);
if (num > 0) {
cp->points = (struct coordinate *)
! alloc((size_t) num * sizeof(struct coordinate), "curve points");
} else
cp->points = (struct coordinate *) NULL;
cp->next_cp = NULL;
--- 113,119 ----
cp->p_max = (num >= 0 ? num : 0);
if (num > 0) {
cp->points = (struct coordinate *)
! alloc(num * sizeof(struct coordinate), "curve points");
} else
cp->points = (struct coordinate *) NULL;
cp->next_cp = NULL;
***************
*** 151,160 ****
if (num > 0) {
if (cp->points == NULL) {
cp->points = (struct coordinate *)
! alloc((size_t) num * sizeof(struct coordinate), "curve points");
} else {
new = (struct coordinate *)
! realloc(cp->points, (size_t) num * sizeof(struct coordinate));
if (new == (struct coordinate *) NULL) {
int_error("No memory available for expanding curve points",
NO_CARET);
--- 146,155 ----
if (num > 0) {
if (cp->points == NULL) {
cp->points = (struct coordinate *)
! alloc(num * sizeof(struct coordinate), "curve points");
} else {
new = (struct coordinate *)
! realloc(cp->points, num * sizeof(struct coordinate));
if (new == (struct coordinate *) NULL) {
int_error("No memory available for expanding curve points",
NO_CARET);
***************
*** 197,207 ****
int num;
{
struct iso_curve *ip;
! ip = (struct iso_curve *) alloc((size_t) sizeof(struct iso_curve), "iso curve");
ip->p_max = (num >= 0 ? num : 0);
if (num > 0) {
ip->points = (struct coordinate *)
! alloc(((size_t) num) * sizeof(struct coordinate), "iso curve points");
} else
ip->points = (struct coordinate *) NULL;
ip->next = NULL;
--- 192,202 ----
int num;
{
struct iso_curve *ip;
! ip = (struct iso_curve *) alloc(sizeof(struct iso_curve), "iso curve");
ip->p_max = (num >= 0 ? num : 0);
if (num > 0) {
ip->points = (struct coordinate *)
! alloc(num * sizeof(struct coordinate), "iso curve points");
} else
ip->points = (struct coordinate *) NULL;
ip->next = NULL;
***************
*** 232,241 ****
if (num > 0) {
if (ip->points == NULL) {
ip->points = (struct coordinate *)
! alloc(((size_t) num) * sizeof(struct coordinate), "iso curve points");
} else {
new = (struct coordinate *)
! realloc(ip->points,((size_t) num) * sizeof(struct coordinate));
if (new == (struct coordinate *) NULL) {
int_error("No memory available for expanding curve points",
NO_CARET);
--- 227,236 ----
if (num > 0) {
if (ip->points == NULL) {
ip->points = (struct coordinate *)
! alloc(num * sizeof(struct coordinate), "iso curve points");
} else {
new = (struct coordinate *)
! realloc(ip->points, num * sizeof(struct coordinate));
if (new == (struct coordinate *) NULL) {
int_error("No memory available for expanding curve points",
NO_CARET);
***************
*** 848,862 ****
* so it depends on this using malloc().
*/
- #ifdef THINK_C
- void *
- alloc(size, message)
- size_t size; /* # of bytes */
- #else
char *
alloc(size, message)
unsigned int size; /* # of bytes */
- #endif
char *message; /* description of what is being allocated */
{
char *p; /* the new allocation */
--- 843,851 ----
diff -c src/misc.c ../gnuplot/misc.csrc/parse.c ../gnuplot/parse.c
*** src/parse.c Mon Jan 27 12:28:16 1992
--- ../gnuplot/parse.c Fri Sep 6 23:00:07 1991
***************
*** 62,67 ****
--- 62,68 ----
static jmp_buf fpe_env;
#define dummy (struct value *) 0
+
#ifdef __TURBOC__
void fpe()
#else
***************
*** 74,92 ****
int an_int;
#else
fpe()
! #endif /* _CRAY */
! #endif /* __ZTC__ */
! #endif /* __TURBOC__ */
{
#ifdef PC /* thanks to lotto@wjh12.UUCP for telling us about this */
_fpreset();
#endif
!
! (void) signal(SIGFPE,
! #ifdef THINK_C
! (__sig_func)
! #endif
! fpe);
undefined = TRUE;
longjmp(fpe_env, TRUE);
}
--- 75,88 ----
int an_int;
#else
fpe()
! #endif
! #endif
! #endif
{
#ifdef PC /* thanks to lotto@wjh12.UUCP for telling us about this */
_fpreset();
#endif
! (void) signal(SIGFPE, fpe);
undefined = TRUE;
longjmp(fpe_env, TRUE);
}
***************
*** 134,144 ****
reset_stack();
if (setjmp(fpe_env))
return; /* just bail out */
! (void) signal(SIGFPE,
! #ifdef THINK_C
! (__sig_func)
! #endif
! fpe); /* catch core dumps on FPEs */
execute_at(at_ptr);
--- 130,136 ----
reset_stack();
if (setjmp(fpe_env))
return; /* just bail out */
! (void) signal(SIGFPE, fpe); /* catch core dumps on FPEs */
execute_at(at_ptr);
***************
*** 188,199 ****
perm_at()
{
register struct at_type *at_ptr;
! register size_t len;
(void) temp_at();
len = sizeof(struct at_type) -
(MAX_AT_LEN - at.a_count)*sizeof(struct at_entry);
! at_ptr = (struct at_type *) alloc((size_t) len, "action table");
(void) memcpy(at_ptr,&at,len);
return(at_ptr);
}
--- 180,191 ----
perm_at()
{
register struct at_type *at_ptr;
! register unsigned int len;
(void) temp_at();
len = sizeof(struct at_type) -
(MAX_AT_LEN - at.a_count)*sizeof(struct at_entry);
! at_ptr = (struct at_type *) alloc(len, "action table");
(void) memcpy(at_ptr,&at,len);
return(at_ptr);
}
***************
*** 205,211 ****
*/
memcpy(dest,src,len)
char *dest,*src;
! size_t len;
{
while (len--)
*dest++ = *src++;
--- 197,203 ----
*/
memcpy(dest,src,len)
char *dest,*src;
! unsigned int len;
{
while (len--)
*dest++ = *src++;
diff -c src/parse.c ../gnuplot/parse.csrc/plot.c ../gnuplot/plot.c
*** src/plot.c Tue Jan 21 10:05:36 1992
--- ../gnuplot/plot.c Fri Sep 6 01:19:10 1991
***************
*** 132,139 ****
#ifdef vms
#define HOME "sys$login:"
- #elif THINK_C
- #define HOME ":"
#else /* vms */
#ifdef MSDOS
--- 132,137 ----
***************
*** 155,162 ****
#ifdef unix
#define PLOTRC ".gnuplot"
- #elif THINK_C
- #define PLOTRC ":gnuplot.ini"
#else /* unix */
#if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
#define PLOTRC ".gnuplot"
--- 153,158 ----
***************
*** 183,190 ****
void ss_interrupt();
(void) signal(SIGINT, ss_interrupt);
#endif
- #elif THINK_C
- (void) signal(SIGINT, (__sig_func) inter);
#else /* MSDOS */
(void) signal(SIGINT, inter);
#endif /* MSDOS */
--- 179,184 ----
***************
*** 196,215 ****
longjmp(env, TRUE); /* return to prompt */
}
- #ifdef THINK_C
- #include <console.h>
- main()
- {
- int argc;
- char **argv;
- argc=ccommand(&argv);
- unix_main(argc,argv);
- }
- unix_main(argc,argv)
- #else
main(argc, argv)
- #endif
int argc;
char **argv;
{
--- 190,197 ----
***************
*** 310,317 ****
save_stack(); /* work-around for MSC 4.0/MSDOS 3.x bug */
(void) signal(SIGINT, ss_interrupt);
#endif
- #elif THINK_C
- (void) signal(SIGINT, (__sig_func) inter);
#else /* MSDOS */
(void) signal(SIGINT, inter); /* go there on interrupt char */
#endif /* MSDOS */
--- 292,297 ----
***************
*** 328,335 ****
/* Look for a gnuplot init file in . or home directory */
#ifdef vms
(void) strcpy(home,HOME);
- #elif THINK_C
- (void) strcat(strcpy(home,getenv(HOME)),":");
#else /* vms */
#if defined(AMIGA_AC_5) || defined(AMIGA_LC_5_1)
strcpy(home,getenv(HOME));
--- 308,313 ----
diff -c src/plot.c ../gnuplot/plot.csrc/plot.h ../gnuplot/plot.h
*** src/plot.h Wed Feb 5 10:42:39 1992
--- ../gnuplot/plot.h Fri Sep 6 01:19:11 1991
***************
*** 33,45 ****
* Send bug reports to
* pixar!bug-gnuplot@sun.com.
*/
- #ifdef THINK_C
- #define macintosh 0
- #include <stdlib.h>
- void * alloc(size_t size, char *message);
- #define HELPFILE ":docs:gnuplot.gih" /* changed by makefile */
- #define TERM "TC_console"
- #endif
#define PROGRAM "G N U P L O T"
#define PROMPT "gnuplot> "
--- 33,38 ----
***************
*** 69,81 ****
#define MIN_CRV_POINTS 100 /* minimum size of points[] in curve_points */
#define MIN_SRF_POINTS 1000 /* minimum size of points[] in surface_points */
- #ifdef THINK_C
- #define MAX_LINE_LEN 256 /* maximum number of chars allowed on line */
- #define MAX_TOKENS 64
- #define MAX_ID_LEN 32 /* max length of an identifier */
- #define MAX_AT_LEN 64 /* max number of entries in action table */
- #define STACK_DEPTH 32
- #else
#define MAX_LINE_LEN 1024 /* maximum number of chars allowed on line */
#define MAX_TOKENS 200
#define MAX_ID_LEN 50 /* max length of an identifier */
--- 62,67 ----
***************
*** 83,89 ****
#define MAX_AT_LEN 150 /* max number of entries in action table */
#define STACK_DEPTH 100
- #endif
#define NO_CARET (-1)
--- 69,74 ----
***************
*** 125,133 ****
#define OS "MS-DOS "
#endif
- #ifdef THINK_C
- #define OS "Mac-OS (with THINK_C 5.0) "
- #endif
#ifndef OS
#define OS ""
--- 110,115 ----
***************
*** 148,160 ****
#ifdef PC
#include <float.h>
#define VERYLARGE FLT_MAX
- #elif THINK_C
- #include <float.h>
- #define VERYLARGE DBL_MAX
- #define MEMCPY
- #undef NOCOPY
- #define NOGAMMA
- #define MEMSET
#else
#if defined( vms ) || defined( _CRAY ) || defined( NEXT )
#include <float.h>
--- 130,135 ----
***************
*** 212,218 ****
# else
# ifdef NOCOPY
/* use the handwritten memcpy in parse.c */
- extern int memcpy(char *,char *,size_t);
# else
/* assume bcopy is in use */
# define memcpy(dest,src,len) bcopy(src,dest,len)
--- 187,192 ----
***************
*** 225,235 ****
* else, define bzero to that something.
*/
#if defined(MEMSET) || defined(MSDOS)
! #define bzero(dest,len) (void)(memset((void *) dest, (char)NULL, (size_t) len))
#endif /* MEMSET || MSDOS */
/* Give the name of your gamma function, or undefine it if you have none. */
! #if defined(NOGAMMA) || defined(MSDOS)
# undef GAMMA
#else
# ifndef GAMMA
--- 199,209 ----
* else, define bzero to that something.
*/
#if defined(MEMSET) || defined(MSDOS)
! #define bzero(dest,len) (void)(memset(dest, (char)NULL, len))
#endif /* MEMSET || MSDOS */
/* Give the name of your gamma function, or undefine it if you have none. */
! #if defined(NOGAMMA) || defined(MSDOS)
# undef GAMMA
#else
# ifndef GAMMA
***************
*** 487,495 ****
extern BOOLEAN undefined;
extern struct termentry term_tbl[];
- #ifndef THINK_C
extern char *alloc();
- #endif
/* allocating and managing curve_points structures */
extern struct curve_points *cp_alloc();
extern int cp_extend();
--- 461,467 ----
diff -c src/plot.h ../gnuplot/plot.hsrc/readline.c ../gnuplot/readline.c
*** src/readline.c Wed Jan 22 08:15:37 1992
--- ../gnuplot/readline.c Wed Sep 11 05:19:46 1991
***************
*** 332,338 ****
case '\r': /* ^M */
cur_line[max_pos+1] = '\0';
putc('\n', stderr);
! new_line = malloc((size_t) strlen(cur_line)+1);
strcpy(new_line,cur_line);
reset_termio();
return(new_line);
--- 332,338 ----
case '\r': /* ^M */
cur_line[max_pos+1] = '\0';
putc('\n', stderr);
! new_line = malloc(strlen(cur_line)+1);
strcpy(new_line,cur_line);
reset_termio();
return(new_line);
***************
*** 433,439 ****
{
struct hist *entry;
entry = (struct hist *)malloc(sizeof(struct hist));
! entry->line = malloc((size_t)strlen(line)+1);
strcpy(entry->line, line);
entry->prev = history;
--- 433,439 ----
{
struct hist *entry;
entry = (struct hist *)malloc(sizeof(struct hist));
! entry->line = malloc((unsigned int)strlen(line)+1);
strcpy(entry->line, line);
entry->prev = history;
diff -c src/readline.c ../gnuplot/readline.csrc/scanner.c ../gnuplot/scanner.c
*** src/scanner.c Mon Jan 27 11:51:29 1992
--- ../gnuplot/scanner.c Fri Sep 6 01:19:12 1991
***************
*** 264,275 ****
int_error("substitution not supported by AmigaDOS!",t_num);
}
- #elif THINK_C
- substitute(char *str,int max)
- {
- int_error("substitution not supported by MacOS!",t_num);
- }
-
#else /* AMIGA_LC_5_1 */
substitute(str,max) /* substitute output from ` ` */
--- 264,269 ----
***************
*** 279,285 ****
register char *last;
register int i,c;
register FILE *f;
! #if defined(AMIGA_AC_5) || defined(THINK_C)
int fd;
#else
FILE *popen();
--- 273,279 ----
register char *last;
register int i,c;
register FILE *f;
! #ifdef AMIGA_AC_5
int fd;
#else
FILE *popen();
***************
*** 313,319 ****
if ((f = fopen(MAILBOX,"r")) == NULL)
os_error("mailbox open failed",NO_CARET);
#else /* vms */
! #if defined(AMIGA_AC_5) || defined(THINK_C)
if ((fd = open(pgm,"O_RDONLY")) == -1)
#else
if ((f = popen(pgm,"r")) == NULL)
--- 307,313 ----
if ((f = fopen(MAILBOX,"r")) == NULL)
os_error("mailbox open failed",NO_CARET);
#else /* vms */
! #ifdef AMIGA_AC_5
if ((fd = open(pgm,"O_RDONLY")) == -1)
#else
if ((f = popen(pgm,"r")) == NULL)
***************
*** 325,331 ****
while ((c = getc(f)) != EOF) {
output[i++] = ((c == '\n') ? ' ' : c); /* newlines become blanks*/
if (i == max) {
! #if defined(AMIGA_AC_5) || defined(THINK_C)
(void) close(fd);
#else
(void) pclose(f);
--- 319,325 ----
while ((c = getc(f)) != EOF) {
output[i++] = ((c == '\n') ? ' ' : c); /* newlines become blanks*/
if (i == max) {
! #ifdef AMIGA_AC_5
(void) close(fd);
#else
(void) pclose(f);
***************
*** 333,339 ****
int_error("substitution overflow", t_num);
}
}
! #if defined(AMIGA_AC_5) || defined(THINK_C)
(void) close(fd);
#else
(void) pclose(f);
--- 327,333 ----
int_error("substitution overflow", t_num);
}
}
! #ifdef AMIGA_AC_5
(void) close(fd);
#else
(void) pclose(f);
***************
*** 345,349 ****
(void) strcpy(str,output); /* now replace ` ` with output */
screen_ok = FALSE;
}
! #endif /* AMIGA_LC_5_1 || THINK_C*/
#endif /* MS-DOS */
--- 339,343 ----
(void) strcpy(str,output); /* now replace ` ` with output */
screen_ok = FALSE;
}
! #endif /* AMIGA_LC_5_1 */
#endif /* MS-DOS */
Only in src: set.c
diff -c src/scanner.c ../gnuplot/scanner.csrc/setshow.c ../gnuplot/setshow.c
*** src/setshow.c Sun Feb 2 11:06:01 1992
--- ../gnuplot/setshow.c Wed Sep 4 08:22:55 1991
***************
*** 548,579 ****
term_init = FALSE;
(void) strcpy(outstr,"STDOUT");
} else if (!isstring(c_token))
- #ifdef THINK_C
- { Point where={97,103};
- SFReply reply;
-
- SFPutFile(where,NULL, "\pUntitled",NULL, &reply);
- if( (reply.good) && (SetVol(reply.fName,reply.vRefNum) == noErr)){
- PtoCstr((char *) reply.fName);
- strcpy(testfile,(char *) reply.fName);
- if ((f = fopen(testfile,"w")) == (FILE *)NULL) {
- os_error("cannot open file; output not changed",c_token);
- }
- if (outfile != stdout) /* Never close stdout */
- (void) fclose(outfile);
- outfile = f;
- term_init = FALSE;
- outstr[0] = '\'';
- (void) strcat(strcpy(outstr+1,testfile),"'");
- UP_redirect (1);
- }
- else{
- int_error("expecting filename",c_token);
- }
- }
- #else
int_error("expecting filename",c_token);
- #endif
else {
quote_str(testfile,c_token);
#ifdef unix
--- 548,554 ----
***************
*** 1229,1235 ****
} else {
/* adding the label */
new_label = (struct text_label *)
! alloc ( (size_t) sizeof(struct text_label), "label");
if (prev_label != NULL)
prev_label->next = new_label; /* add it to end of list */
else
--- 1204,1210 ----
} else {
/* adding the label */
new_label = (struct text_label *)
! alloc ( (unsigned int) sizeof(struct text_label), "label");
if (prev_label != NULL)
prev_label->next = new_label; /* add it to end of list */
else
***************
*** 1444,1450 ****
} else {
/* adding the arrow */
new_arrow = (struct arrow_def *)
! alloc ( (size_t) sizeof(struct arrow_def), "arrow");
if (prev_arrow != NULL)
prev_arrow->next = new_arrow; /* add it to end of list */
else
--- 1419,1425 ----
} else {
/* adding the arrow */
new_arrow = (struct arrow_def *)
! alloc ( (unsigned int) sizeof(struct arrow_def), "arrow");
if (prev_arrow != NULL)
prev_arrow->next = new_arrow; /* add it to end of list */
else
***************
*** 1594,1600 ****
/* has a string with it? */
if (isstring(c_token)) {
quote_str(temp_string,c_token);
! tic->label = alloc((size_t)strlen(temp_string)+1, "tic label");
(void) strcpy(tic->label, temp_string);
c_token++;
} else
--- 1569,1575 ----
/* has a string with it? */
if (isstring(c_token)) {
quote_str(temp_string,c_token);
! tic->label = alloc((unsigned int)strlen(temp_string)+1, "tic label");
(void) strcpy(tic->label, temp_string);
c_token++;
} else
***************
*** 2595,2597 ****
--- 2570,2601 ----
udv = udv->next_udv;
}
}
+
+ void /* used by plot.c */
+ show_version()
+ {
+ extern char version[];
+ extern char patchlevel[];
+ extern char date[];
+ extern char bug_email[];
+ static char *authors[] = {"Thomas Williams","Colin Kelley"}; /* primary */
+ int x;
+ long time();
+
+ x = time((long *)NULL) & 1;
+ fprintf(stderr,"\n\t%s\n\t%sversion %s\n",
+ PROGRAM, OS, version);
+ fprintf(stderr,"\tpatchlevel %s\n",patchlevel);
+ fprintf(stderr, "\tlast modified %s\n", date);
+ fprintf(stderr,"\tCopyright (C) 1986, 1987, 1990, 1991 %s, %s\n",
+ authors[x],authors[1-x]);
+ fprintf(stderr, "\n\tSend bugs and comments to %s\n", bug_email);
+ }
+
+
+
+
+
+
+
+
Only in src: show.c
Only in src: show_version.c
Common subdirectories: src/term and ../gnuplot/term
diff -c src/setshow.c ../gnuplot/setshow.csrc/term.c ../gnuplot/term.c
*** src/term.c Tue Feb 4 12:28:31 1992
--- ../gnuplot/term.c Fri Sep 6 01:19:15 1991
***************
*** 239,250 ****
}
#ifdef DUMB /* paper or glass dumb terminal */
! #include ":term:dumb.trm"
#endif
#ifdef PC /* all PC types */
! #include ":term:pc.trm"
#endif
/*
--- 239,250 ----
}
#ifdef DUMB /* paper or glass dumb terminal */
! #include "term/dumb.trm"
#endif
#ifdef PC /* all PC types */
! #include "term/pc.trm"
#endif
/*
***************
*** 283,301 ****
#endif
#ifdef T410X /* Tektronix 4106, 4107, 4109 and 420x terminals */
! #include ":term:t410x.trm"
#endif
#ifdef TEK /* all TEK types, TEK, BBN, SELANAR, KERMIT, VTTEK */
! #include ":term:tek.trm"
#endif
#ifdef EPSONP /* bit map types, EPSON, NEC, PROPRINTER, STAR Color */
! #include ":term:epson.trm"
#endif
#ifdef HPLJII /* HP LaserJet II */
! #include ":term:hpljii.trm"
#endif
#ifdef HPLJII /* HP LaserJet III in HPGL mode */
--- 283,301 ----
#endif
#ifdef T410X /* Tektronix 4106, 4107, 4109 and 420x terminals */
! #include "term/t410x.trm"
#endif
#ifdef TEK /* all TEK types, TEK, BBN, SELANAR, KERMIT, VTTEK */
! #include "term/tek.trm"
#endif
#ifdef EPSONP /* bit map types, EPSON, NEC, PROPRINTER, STAR Color */
! #include "term/epson.trm"
#endif
#ifdef HPLJII /* HP LaserJet II */
! #include "term/hpljii.trm"
#endif
#ifdef HPLJII /* HP LaserJet III in HPGL mode */
***************
*** 305,328 ****
#endif
#ifdef FIG /* Fig 1.4FS Interactive graphics program */
! #include ":term:fig.trm"
! #include ":term:bigfig.trm"
#endif
#ifdef GPR /* Apollo Graphics Primitive Resource (fixed-size window) */
! #include ":term:gpr.trm"
#endif /* GPR */
#ifdef APOLLO /* Apollo Graphics Primitive Resource (resizable window) */
! #include ":term:apollo.trm"
#endif /* APOLLO */
#ifdef IMAGEN /* IMAGEN printer */
! #include ":term:imagen.trm"
#endif
#ifdef EEPIC /* EEPIC (LATEX) type */
! #include ":term:eepic.trm"
# ifndef LATEX
# define LATEX
# endif
--- 305,328 ----
#endif
#ifdef FIG /* Fig 1.4FS Interactive graphics program */
! #include "term/fig.trm"
! #include "term/bigfig.trm"
#endif
#ifdef GPR /* Apollo Graphics Primitive Resource (fixed-size window) */
! #include "term/gpr.trm"
#endif /* GPR */
#ifdef APOLLO /* Apollo Graphics Primitive Resource (resizable window) */
! #include "term/apollo.trm"
#endif /* APOLLO */
#ifdef IMAGEN /* IMAGEN printer */
! #include "term/imagen.trm"
#endif
#ifdef EEPIC /* EEPIC (LATEX) type */
! #include "term/eepic.trm"
# ifndef LATEX
# define LATEX
# endif
***************
*** 335,370 ****
#endif
#ifdef LATEX /* LATEX type */
! #include ":term:latex.trm"
#endif
#ifdef POSTSCRIPT /* POSTSCRIPT type */
! #include ":term:post.trm"
#endif
#ifdef PRESCRIBE /* PRESCRIBE type */
! #include ":term:kyo.trm"
#endif
#ifdef UNIXPC /* unix-PC ATT 7300 or 3b1 machine */
! #include ":term:unixpc.trm"
#endif /* UNIXPC */
#ifdef AED
! #include ":term:aed.trm"
#endif /* AED */
#ifdef CGI
! #include ":term:cgi.trm"
#endif /* CGI */
#ifdef HP2648
/* also works for HP2647 */
! #include ":term:hp2648.trm"
#endif /* HP2648 */
#ifdef HP26
! #include ":term:hp26.trm"
#endif /* HP26 */
#ifdef HP75
--- 335,370 ----
#endif
#ifdef LATEX /* LATEX type */
! #include "term/latex.trm"
#endif
#ifdef POSTSCRIPT /* POSTSCRIPT type */
! #include "term/post.trm"
#endif
#ifdef PRESCRIBE /* PRESCRIBE type */
! #include "term/kyo.trm"
#endif
#ifdef UNIXPC /* unix-PC ATT 7300 or 3b1 machine */
! #include "term/unixpc.trm"
#endif /* UNIXPC */
#ifdef AED
! #include "term/aed.trm"
#endif /* AED */
#ifdef CGI
! #include "term/cgi.trm"
#endif /* CGI */
#ifdef HP2648
/* also works for HP2647 */
! #include "term/hp2648.trm"
#endif /* HP2648 */
#ifdef HP26
! #include "term/hp26.trm"
#endif /* HP26 */
#ifdef HP75
***************
*** 375,434 ****
/* HPGL - includes HP75 and HPLJIII in HPGL mode */
#ifdef HPGL
! #include ":term:hpgl.trm"
#endif /* HPGL */
/* Roland DXY800A plotter driver by Martin Yii, eln557h@monu3.OZ
and Russell Lang, rjl@monu1.cc.monash.oz */
#ifdef DXY800A
! #include ":term:dxy.trm"
#endif /* DXY800A */
#ifdef IRIS4D
! #include ":term:iris4d.trm"
#endif /* IRIS4D */
#ifdef QMS
! #include ":term:qms.trm"
#endif /* QMS */
#ifdef REGIS
! #include ":term:regis.trm"
#endif /* REGIS */
#ifdef SUN
! #include ":term:sun.trm"
#endif /* SUN */
#ifdef VWS
! #include ":term:vws.trm"
#endif /* VWS */
#ifdef V384
! #include ":term:v384.trm"
#endif /* V384 */
#ifdef UNIXPLOT
! #include ":term:unixplot.trm"
#endif /* UNIXPLOT */
#ifdef X11
! #include ":term:x11.trm"
#endif /* X11 */
#ifdef DXF
! #include ":term:dxf.trm"
#endif /* DXF */
#ifdef AMIGASCREEN
! #include ":term:amiga.trm"
#endif
- #ifdef THINK_C
- #include ":term:THINKC_console.trm"
- #endif
-
/* Dummy functions for unavailable features */
/* change angle of text. 0 is horizontal left to right.
--- 375,430 ----
/* HPGL - includes HP75 and HPLJIII in HPGL mode */
#ifdef HPGL
! #include "term/hpgl.trm"
#endif /* HPGL */
/* Roland DXY800A plotter driver by Martin Yii, eln557h@monu3.OZ
and Russell Lang, rjl@monu1.cc.monash.oz */
#ifdef DXY800A
! #include "term/dxy.trm"
#endif /* DXY800A */
#ifdef IRIS4D
! #include "term/iris4d.trm"
#endif /* IRIS4D */
#ifdef QMS
! #include "term/qms.trm"
#endif /* QMS */
#ifdef REGIS
! #include "term/regis.trm"
#endif /* REGIS */
#ifdef SUN
! #include "term/sun.trm"
#endif /* SUN */
#ifdef VWS
! #include "term/vws.trm"
#endif /* VWS */
#ifdef V384
! #include "term/v384.trm"
#endif /* V384 */
#ifdef UNIXPLOT
! #include "term/unixplot.trm"
#endif /* UNIXPLOT */
#ifdef X11
! #include "term/x11.trm"
#endif /* X11 */
#ifdef DXF
! #include "term/dxf.trm"
#endif /* DXF */
#ifdef AMIGASCREEN
! #include "term/amiga.trm"
#endif
/* Dummy functions for unavailable features */
/* change angle of text. 0 is horizontal left to right.
***************
*** 1045,1059 ****
X11_linetype, X11_put_text, null_text_angle,
X11_justify_text, do_point, do_arrow}
#endif
-
- #ifdef THINK_C
- ,{"TC_console", "THINK_C console enviroment",
- TC_XMAX, TC_YMAX, TC_VCHAR, TC_HCHAR,
- TC_VTIC, TC_HTIC, options_null,TC_init, TC_reset,
- TC_text, null_scale, TC_graphics, TC_move, TC_vector,
- TC_linetype, TC_put_text, null_text_angle,
- null_justify_text, line_and_point, do_arrow} /* Think Console ++ */
- #endif
};
#define TERMCOUNT (sizeof(term_tbl)/sizeof(struct termentry))
--- 1041,1046 ----
***************
*** 1177,1183 ****
#endif /* sun */
#ifdef GPR
! if (gpr_isa_pad()) term_name = "gpr"; /* find out whether stdout is a DM pad. See :term:gpr.trm */
#else
#ifdef APOLLO
if (apollo_isa_pad()) term_name = "apollo"; /* find out whether stdout is a DM pad. See term/apollo.trm */
--- 1164,1170 ----
#endif /* sun */
#ifdef GPR
! if (gpr_isa_pad()) term_name = "gpr"; /* find out whether stdout is a DM pad. See term/gpr.trm */
#else
#ifdef APOLLO
if (apollo_isa_pad()) term_name = "apollo"; /* find out whether stdout is a DM pad. See term/apollo.trm */
diff -c src/term.c ../gnuplot/term.csrc/term.h ../gnuplot/term.h
*** src/term.h Sat Jan 25 12:50:56 1992
--- ../gnuplot/term.h Fri Sep 6 01:19:16 1991
***************
*** 44,101 ****
*/
/* These terminals are not relevant for MSDOS */
! #ifndef THINK_C
! #ifndef MSDOS
!
! #ifdef AMIGA_LC_5_1
! #define AMIGASCREEN /* Amiga custom screen */
!
! #else /* AMIGA_LC_5_1 */
!
! #ifdef AMIGA_AC_5
! #define AMIGASCREEN /* Amiga custom screen */
! #endif
! #define AED /* AED 512 and AED 767 */
! #define BITGRAPH /* BBN BitGraph */
! /* #define CGI /* SCO CGI */
! /* #define IRIS4D /* IRIS4D series computer */
! #define KERMIT /* MS-Kermit Tektronix 4010 emulator */
! #define FIG /* Fig graphics language */
! #define REGIS /* ReGis graphics (vt125, vt220, vt240, Gigis...) */
! #define SELANAR /* Selanar */
! /* #define SUN /* Sun Microsystems Workstation */
! #define T410X /* Tektronix 4106, 4107, 4109 and 420x terminals */
! #define TEK /* Tektronix 4010, and probably others */
! /* #define UNIXPC /* unixpc (ATT 3b1 or ATT 7300) */
! /* #define UNIXPLOT /* unixplot */
! #define VTTEK /* VT-like tek40xx emulators */
! /* #define X11 /* X11R4 window system */
!
! #endif /* AMIGA_LC_5_1 */
!
! #define DXY800A /* Roland DXY800A plotter */
!
! #define HP2648 /* HP2648, HP2647 */
! #define HP26 /* HP2623A and maybe others */
! #define HP75 /* HP7580, and probably other HPs */
! #define IMAGEN /* Imagen laser printers (300dpi) (requires -Iterm also) */
!
! #define NEC /* NEC CP6 pinwriter printer */
! #define PRESCRIBE /* Kyocera Laser printer */
! #define QMS /* QMS/QUIC laserprinter (Talaris 1200 and others) */
! #define STARC /* Star Color Printer */
! #define TANDY60 /* Tandy DMP-130 series 60-dot per inch graphics */
! #define V384 /* Vectrix 384 and tandy color printer */
!
! #endif /* not MSDOS */
! #else /* THINK_C */
! #define KERMIT /* MS-Kermit Tektronix 4010 emulator */
! #define T410X /* Tektronix 4106, 4107, 4109 and 420x terminals */
! #define TEK /* Tektronix 4010, and probably others */
! #define VTTEK /* VT-like tek40xx emulators */
! #define DXF /* DXF format for use with AutoCad (Release 10.x) */
#endif
/* These terminals can be used on any system */
#define DUMB
--- 44,93 ----
*/
/* These terminals are not relevant for MSDOS */
! #ifndef MSDOS
!
! #ifdef AMIGA_LC_5_1
! #define AMIGASCREEN /* Amiga custom screen */
!
! #else /* AMIGA_LC_5_1 */
!
! #ifdef AMIGA_AC_5
! #define AMIGASCREEN /* Amiga custom screen */
#endif
+ #define AED /* AED 512 and AED 767 */
+ #define BITGRAPH /* BBN BitGraph */
+ /* #define CGI /* SCO CGI */
+ /* #define IRIS4D /* IRIS4D series computer */
+ #define KERMIT /* MS-Kermit Tektronix 4010 emulator */
+ #define FIG /* Fig graphics language */
+ #define REGIS /* ReGis graphics (vt125, vt220, vt240, Gigis...) */
+ #define SELANAR /* Selanar */
+ /* #define SUN /* Sun Microsystems Workstation */
+ #define T410X /* Tektronix 4106, 4107, 4109 and 420x terminals */
+ #define TEK /* Tektronix 4010, and probably others */
+ /* #define UNIXPC /* unixpc (ATT 3b1 or ATT 7300) */
+ /* #define UNIXPLOT /* unixplot */
+ #define VTTEK /* VT-like tek40xx emulators */
+ /* #define X11 /* X11R4 window system */
+ #endif /* AMIGA_LC_5_1 */
+
+ #define DXY800A /* Roland DXY800A plotter */
+
+ #define HP2648 /* HP2648, HP2647 */
+ #define HP26 /* HP2623A and maybe others */
+ #define HP75 /* HP7580, and probably other HPs */
+ #define IMAGEN /* Imagen laser printers (300dpi) (requires -Iterm also) */
+
+ #define NEC /* NEC CP6 pinwriter printer */
+ #define PRESCRIBE /* Kyocera Laser printer */
+ #define QMS /* QMS/QUIC laserprinter (Talaris 1200 and others) */
+ #define STARC /* Star Color Printer */
+ #define TANDY60 /* Tandy DMP-130 series 60-dot per inch graphics */
+ #define V384 /* Vectrix 384 and tandy color printer */
+
+ #endif /* MSDOS */
+
/* These terminals can be used on any system */
#define DUMB
***************
*** 109,125 ****
#define EMTEX /* LATEX picture environment with EMTEX specials */
#define EPS60 /* Epson-style 60-dot per inch printers */
#define EPSONP /* Epson LX-800, Star NL-10, NX-1000 and lots of others */
! /* #define HPLJII /* HP LaserJet II */
#define LATEX /* LATEX picture environment */
/* These are for MSDOS only */
#ifdef MSDOS
! #ifdef __TURBOC__
! #define ATT6300 /* AT&T 6300 graphics */
! #else
! #define ATT6300 /* AT&T 6300 graphics */
! #define CORONA /* Corona graphics 325 */
! #define HERCULES /* IBM PC/Clone with Hercules graphics board */
! #endif /* __TURBOC__ */
#endif /* MSDOS */
--- 101,117 ----
#define EMTEX /* LATEX picture environment with EMTEX specials */
#define EPS60 /* Epson-style 60-dot per inch printers */
#define EPSONP /* Epson LX-800, Star NL-10, NX-1000 and lots of others */
! #define HPLJII /* HP LaserJet II */
#define LATEX /* LATEX picture environment */
/* These are for MSDOS only */
#ifdef MSDOS
! #ifdef __TURBOC__
! #define ATT6300 /* AT&T 6300 graphics */
! #else
! #define ATT6300 /* AT&T 6300 graphics */
! #define CORONA /* Corona graphics 325 */
! #define HERCULES /* IBM PC/Clone with Hercules graphics board */
! #endif /* __TURBOC__ */
#endif /* MSDOS */
diff -c src/term.h ../gnuplot/term.hsrc/util.c ../gnuplot/util.c
*** src/util.c Mon Jan 27 11:29:59 1992
--- ../gnuplot/util.c Sun Sep 8 23:01:17 1991
***************
*** 47,58 ****
#ifndef vms
#ifndef __ZTC__
- #ifndef THNK_C
extern int errno;
extern int sys_nerr;
extern char *sys_errlist[];
#endif
- #endif
#endif /* vms */
extern char input_line[];
--- 47,56 ----
***************
*** 515,522 ****
(void) putc('\n',stderr);
#else
#ifdef __ZTC__
- fprintf(stderr,"error number %d\n\n",errno);
- #elif THINK_C
fprintf(stderr,"error number %d\n\n",errno);
#else
if (errno >= sys_nerr)
--- 513,518 ----